Actually finish

Getting rid of timeline in prototype