Commit for review. I have a few console errors. Not sure where they're coming from