BUG|WIP: Bug fixes and changes to naming. Still untested