Continued dev on 0.3.x

making sure the refacting works with the use of the sample application 

Start on testing, really need more!