Up to date

Code is up to date with basecode, but many changes were removed. Will
need to redo it.