Not working commit
Just commiting to get an checkpoint for what I've done