Further devel

Have fun!
@guillermo-carrasco it should all work except that I only pulled out the pieces that I thought I needed at the time and haven't run any tests on it, so it might have some cases that are dead ends.