New upload,

Started incorporating dc42's changes into the core