commiting bunch of WIP, long time after, not looking at