reverted changes

branches are stupid. git hub annoying. reverted back to what paul had
done. yay? might be behind an update, but seems to be working fine.