Add all functinality for MVP