WORK IN PROGRESS - Initial upload REV 0

Code to be tested