major overhaul, definitely a lot of bugs