New tasks added

Still got a lot to do