Removed stuff that wasnt working, getting there...