Got basic implementation back

Yeah, this probably could've been done with fancy git features, but
these are the changes I made previously which are "necessary" for things
to get working as fast as possible