Added more features, working on MVP definition