Updated to new basecode

Not quite finished yet but it's working.