Felt bad about cutting some corners, so I made things better