Merge ASAP

All major changes done. Only last notice feature left.