Better dependencies; resource handling WIP.