Made more generic, finished text making, started on timer
Merged successfully