printing identical to cal, but not passing tests because of invisible spacing differences
fixing merge problems
small refactors
fixing merge