Build out and finalize changes for directory changing and what not.
Should now work much more intuitively :)