Refactored almost done

13:32 29/08/13