Adding some wip stuff