Finished refactoring Faunus for Titan integration. NOT YET TESTED or DEBUGGED.