Finished moving over to the new hard way template