Much rejoice! All tests passing :) time to beautify it I guess...