Major refactor issue

[zyteka]

Sibylapp's code is becoming increasingly difficult to work with - before we go too much farther we should do a major refactor to ensure each function does exactly one task and does it flexibly.