CLEANUP!

[vjeeva]

Right now many changes were made without full support of other features.

This issue will be updated with cleanup items.

• README
• Change Todos to my own? Or update them?

[vjeeva]

Adding to this is cleaning up the recent code!

Without changing functionality, I need to extract repeated code, fix inheritance by not doing the self.X thing over and over again because it's easy. Need to clean up the code.