Cleaned some code and created simple passable