WIP
WIP
Still working on it.
Ignore anything but master for now