Done with assignment. WIll tweak some more and probably need to clean up the git tree.