Created skeleton of much cleaner module