Added new stuff, need to redo a lot.