Stuff i worked on
Revert "Stuff i worked on"

This reverts commit 43b544e3f4f0f07c7e915c34b589f0d90b9509fa.