Version 0.1.7

Major Updates to get it to a usable solution.