adding a bunch more awesome stuff