Added it all

Added all of the current code