got most of the tasks related stuff working, but looking to rearrange things to packages