Submission worthy - just need to add documentation