Not fully working, but progressed...