adding in basics
adding in tons of stuff