more work
reorganization
added motivation to finish this :(
added motivation to finish this :(