basically: (WIP) what should I add? ANOTHER UPDATE