Lots changed, still many issues on tick()