Yet even more changes!

Things are starting to work! Kind of!