Feature Complete for 0.2.0

Trying to fix the issues with commits before.