More work, semi working now...