First commit on branch
Modified names and variables
Not tested on BF display