Stubbing completed. Finalized open elements and cleaned up large pieces of code ...