Getting it to work

These are the changes that were made when I included the libraries I
needed to get it working again. Not sure if they would cause problems if
merged back into main.