added some features
added classes
Merge pull request #1 from mayognaise/dev

Added some features