This Version works, however it is unfinished
Still better than the previous commit