[BROKEN] Physics Update - Unfinished (#3)