Working on getting conventions and code working cleanly.