Moved allotment code into own files started writing tests