Added some more source files from another workstation, merging them soon.