finished basic functionality
fixed my shit