Lots of changes, not working as expected, Needs a lot of clean up