making good progress on redesign
whoops, last commit was a lil borked