Finish After school issues. Closes #22 , #23