Second Commit: Lots of changes