Fixed lint issues
Experimenting
Initial version - wip