Functioning now

This is now functioning, but it's ugly (in code and appearance).