started adding gameplay and collision variables
merged
extended collision code