Initial Serial Commit
Fixed merge errors