More stuff working
Simplify source handling