WIP - Move to asset pipeline
Move completely to asset pipeline