Giant update that basically does everything. Only polish now