v1.0.0 - massive refactoring (missing stuff)