WIP getting shit working