A bunch of changes. Trying to get this done before the morning...