Feat/unpolished mvp