MVP
Big time refactor!
Add license