Development working; need to add exception handling