New stuff

Still probably some janky stuff here, but anyway, here's to something that hopefully works?