Refactoring, more reply form functionality (yay)