Cosmetic changes
More work
Static sensor variables properly defined
Compilation happening