Updating things. This will soon be ready to be merged back into the master