Fixing and breaking

Working on getting things working and then changing to better
programming tactics.