added more stuff, still a WIP