LOTS of changes. period
herpderp (redux)