MVP Testing

Build that is ready for MVP testing