had lunch, finished work, will now clean up and add documentation and more readable code