merged completely/correctly with kingtak's front end