Converted getters/setters to properties
Added init to allow imports
Changed class names to CAPS for clarity and PEP8
Minor bugfix and cleanup
Merged experimental work back into master.