Completely redone, implemented physics