sooo many bugs. but now they are squashed :D