Workspace migration and some small bug fixes

Should see updates as I made modifications now. Will need to have a sit
down session to go over the general form of the source and do some
cleanup.