Have a small bug, but pushing so you can see what I have