Continued work

Added lots of stuff