Updating basecode, adding in a few things