system done... but not as awesome as it should be