Made final modifications, just looking for bugs and better compiling now.