Added some code, still a wip