Revert "Revert "Here are the final big changes!""
Merge pull request #22 from sundaisun/revert-20-revert-19-master

Revert "Revert "Here are the final big changes!""