Spotweb refactor
spotweb refactor branch pushed to master