WIPs
Merge pull request #436 from Vexatos/patch-1

Added WIPs and more stuff