begun re-orginizing where functions live
debugging; forgot to activate a feture