Almost finished features entirely! WHOOO