Preliminary commit, doing some cleanup and adding documentation