More testing

Much psuedo code, but some progress at least.. Getting close to the
point were I should actually commit few changes at a time
Tests