john, nialls work merged

platforms moves, collides, static barrier