Last commit before moving on towards the boblight version