Pushing this commit before I start fixing up this code