Added testing system, line counting system, and started cleaning up code.