Finished up basic marks saving, fixed bugs with recording activity