Update now includes working everything! (Except observation points cause I'm too lazy to go fix it...)
