WIP, tell me if theres any issues or anything to add.