Add shit ton of stuff. Proper structure