Yeah, sorry for the effort. Rework was necessary to save us a lot of time on development in the future.
