Working version, just need to clean everything up