quick commit
rewrote all to utilize dependency transportation