Merge time
new main, has to be rewritten