First push with new refactored code. I've managed to break almost everything. But I am still making progress to a sleeker design. Will keep working on it.