Done\! Still must test more, otherwise seems to be working