Updated: Latest changes

Still probably not suitable for use