got the poor thing to run
Pre-work merge