did good refacturing + everything starts to look really good! Still need to do the encoder logic though