Let's simplify this crap
Starting to fill in some doc