gotten all main features to work