Final v0.3 Commit - Everything is working