Core MVP functionality in place