back to square 2-ish, working on rotating