lots of cool progress
added new stuff