Condense everything before I break something

Added some documentation and took old code out