removed some code, still a lot of bugs