Added a lot of bugs and unfinished features