Forgot to commit changes to existing files. Also added in debug file with a few handy debug methods.