Merge WIP state into master, also rendering the entire project unusable for now