Come on damnit
Added WIP stuff from earlier project