I think something is messing up in my commits so this is a test, fixed some of the bugs and code format.