Few small things
Working now
Some really dinky tests
Modified for decoupled testing