v1.0.11 - Refactors and such