Sorted out the client-side note mess