Did a bit of theme prototyping.
Changed Sql class to make easier for injection.
Somemore theme prototyping and changed method of dep injection.