Order has been brought

Well I've managed to do it... now just need to improve and refine it over time.