WIP
WIP + added new resources