MVP

Most fixes has been applied and we now have an MVP.