Some stuff added.

Compiles but needs work.
Fixed timer