Cleaning up code.
Created class as include file.
Lots of updates.
New design / interface