Made some minor changes hopefully have something that looks like it could work