Added comments functionality, still working out bugs