It kind of works!

Uploading this to beta and master. Currently it works but some features
are incomplete