everything unstable currently, working on task 1.1. major changes everywhere