Started major restructure [UNUSABLE CURRENTLY]