WIP - Some more stuff DO NOT BASE ON THIS COMMIT!!