LETS TRY AGAIN

Copied, but did not MERGE my files from lockhart branch