Finished first stage of Chart exercise refactor