5/1/2014 Changes

Most things work, we just need to add more detail