functionality is complete! did some quick reorganizing. now ready to refactor and reorganize some more